From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 10 Dec 2025 22:56:06 +0000 (+0100)
Subject: makebranch: update openwrt-keyring package with target version
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22https:/github.com/fatedier/frp%22/%22https:/collectd.org/%22https:/github.com/fatedier/frp%22?a=commitdiff_plain;p=maintainer-tools.git

makebranch: update openwrt-keyring package with target version

On branching for a new version, also update the openwrt-keyring to
install the specific .pem key.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/makebranch.sh b/makebranch.sh
index 0e39749..7a82de6 100755
--- a/makebranch.sh
+++ b/makebranch.sh
@@ -138,10 +138,15 @@ sed -e 's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$bas
 	package/base-files/image-config.in > package/base-files/image-config.branch && \
 		mv package/base-files/image-config.branch package/base-files/image-config.in
 
+sed -e 's!openwrt-.*.pem!openwrt-'"$version"'.pem!g' \
+	package/system/openwrt-keyring/Makefile > package/system/openwrt-keyring/Makefile.branch && \
+		mv package/system/openwrt-keyring/Makefile.branch package/system/openwrt-keyring/Makefile
+
 git commit -sm "${distname:-OpenWrt} v$version: set branch defaults" \
 	feeds.conf.default \
 	include/version.mk \
-	package/base-files/image-config.in
+	package/base-files/image-config.in \
+	package/system/openwrt-keyring/Makefile
 
 git --no-pager log -p -1
 git checkout "${prev_branch#refs/heads/}"